Skip to content

Conversation

@fang-xing-esql
Copy link
Member

Backport

This will backport the following commits from main to 8.x:

Questions ?

Please refer to the Backport tool documentation

…elastic#125690)

* take double parameter markers out of snapshot

(cherry picked from commit a0dce5c)

# Conflicts:
#	x-pack/plugin/esql/src/main/antlr/EsqlBaseLexer.tokens
#	x-pack/plugin/esql/src/main/antlr/EsqlBaseParser.tokens
#	x-pack/plugin/esql/src/main/antlr/lexer/Enrich.g4
#	x-pack/plugin/esql/src/main/antlr/lexer/Expression.g4
#	x-pack/plugin/esql/src/main/antlr/lexer/MvExpand.g4
#	x-pack/plugin/esql/src/main/antlr/lexer/Project.g4
#	x-pack/plugin/esql/src/main/antlr/lexer/Rename.g4
#	x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/parser/EsqlBaseLexer.interp
#	x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/parser/EsqlBaseLexer.java
#	x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/parser/EsqlBaseParser.interp
#	x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/parser/EsqlBaseParser.java
@fang-xing-esql fang-xing-esql added >enhancement auto-merge-without-approval Automatically merge pull request when CI checks pass (NB doesn't wait for reviews!) test-release Trigger CI checks against release build labels Mar 27, 2025
@fang-xing-esql
Copy link
Member Author

@elasticmachine run docs-build

@elasticsearchmachine elasticsearchmachine merged commit 2d9d0dc into elastic:8.x Mar 28, 2025
15 checks passed
@fang-xing-esql fang-xing-esql deleted the backport/8.x/pr-125690 branch March 28, 2025 01:35
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

auto-merge-without-approval Automatically merge pull request when CI checks pass (NB doesn't wait for reviews!) backport >enhancement test-release Trigger CI checks against release build v8.19.0

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants